From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 29 May 2012 19:07:54 +0000 (+0200)
Subject: panel: Refuse to add (legacy) status icons not part of the session mode
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6534
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ebbd295ebe6fd1445faaff67b47e8e781ab8ba1e;p=gnome-shell.git

panel: Refuse to add (legacy) status icons not part of the session mode

If a session mode does not use certain status items, we don't want their
fallback implementation to show up either, so filter them out.

https://bugzilla.gnome.org/show_bug.cgi?id=677058
---

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 121dab2a9..06d430056 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1144,6 +1144,9 @@ const Panel = new Lang.Class({
             return;
         }
 
+        if (Main.sessionMode.statusArea.order.indexOf(role) == -1)
+            return;
+
         icon.height = PANEL_ICON_SIZE;
         let buttonBox = new PanelMenu.ButtonBox();
         let box = buttonBox.actor;